From 8e36e4bab17319062c44902d5f7c44cc9493dc23 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 27 Jul 2015 18:45:05 +0100 Subject: [PATCH] xl: valid fd can be 0 in main_loadpolicy Initialise polFd to -1 before hand to avoid closing 0 by accident. Also fixed some style problems while I was there. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 74edf2cc7a..9c19fbbc76 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7851,7 +7851,7 @@ int main_setenforce(int argc, char **argv) int main_loadpolicy(int argc, char **argv) { const char *polFName; - int polFd = 0; + int polFd = -1; void *polMemCp = NULL; struct stat info; int ret; @@ -7863,7 +7863,7 @@ int main_loadpolicy(int argc, char **argv) polFName = argv[optind]; polFd = open(polFName, O_RDONLY); - if ( polFd < 0 ) { + if (polFd < 0) { fprintf(stderr, "Error occurred opening policy file '%s': %s\n", polFName, strerror(errno)); ret = -1; @@ -7871,7 +7871,7 @@ int main_loadpolicy(int argc, char **argv) } ret = stat(polFName, &info); - if ( ret < 0 ) { + if (ret < 0) { fprintf(stderr, "Error occurred retrieving information about" "policy file '%s': %s\n", polFName, strerror(errno)); goto done; @@ -7903,7 +7903,7 @@ int main_loadpolicy(int argc, char **argv) done: free(polMemCp); - if ( polFd > 0 ) + if (polFd >= 0) close(polFd); return ret; -- 2.30.2